From 726d3280bff559cac653baa5d4e279e771343e30 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sun, 2 May 2010 10:57:18 -0700 Subject: [PATCH] Don't define unix when building Emacs (add-unix-to-cpp-undefs.diff). --- debian/changelog | 5 +++- debian/patches/add-unix-to-cpp-undefs.diff | 30 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 debian/patches/add-unix-to-cpp-undefs.diff diff --git a/debian/changelog b/debian/changelog index 1a9a2502bc9..0a2a112cdb2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,7 +25,10 @@ emacs23 (23.1+1-7) unstable; urgency=low Policy 12.2), and remove install-info dependency from packages without info files. - -- Rob Browning Sat, 01 May 2010 19:48:11 -0700 + * Don't define unix when building emacs + (add-unix-to-cpp-undefs.diff). + + -- Rob Browning Sun, 02 May 2010 10:56:09 -0700 emacs23 (23.1+1-6) unstable; urgency=low diff --git a/debian/patches/add-unix-to-cpp-undefs.diff b/debian/patches/add-unix-to-cpp-undefs.diff new file mode 100644 index 00000000000..84150906938 --- /dev/null +++ b/debian/patches/add-unix-to-cpp-undefs.diff @@ -0,0 +1,30 @@ +* ./configure should no longer define "unix" when building Emacs. + Patch: add-unix-to-cpp-undefs.diff + Date: Sun May 2 07:23:27 UTC 2010 + Added-by: Rob Browning + Status: incorporated upstream + + Before this fix, gcc would produce the following warning: + + gcc: unrecognized option '-2.0/' + + The Debian patch is taken from this upstream commit: + + revno: 99984 + committer: Miles Bader + branch nick: trunk + timestamp: Thu 2010-04-22 09:10:30 +0900 + message: + get rid of "unix" pre-defined macro when preprocessing Makefile + +--- a/configure.in ++++ b/configure.in +@@ -2937,7 +2937,7 @@ + # the C preprocessor to some helpful value like 1, or maybe the empty + # string. Needless to say consequent macro substitutions are less + # than conducive to the makefile finding the correct directory. +-[cpp_undefs="`echo $srcdir $configuration $canonical | ++[cpp_undefs="`echo $srcdir $configuration $canonical unix | + sed -e 's/[^a-zA-Z0-9_]/ /g' -e 's/^/ /' -e 's/ *$//' \ + -e 's/ */ -U/g' -e 's/-U[0-9][^ ]*//g'`"] + diff --git a/debian/patches/series b/debian/patches/series index 8864013b4f0..cbf570c9f51 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -12,3 +12,4 @@ fix-rmail-capitalized-month-names.diff fix-dynamic-menus.diff fix-gtk-scroll-bar-events.diff use-zwj-and-zwnj-for-indic-scripts.diff +add-unix-to-cpp-undefs.diff -- 2.30.2